Micron Document
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
| SparkN0de-git | SparkN0de |
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------

Node / ReticulumProjects / RNode_Firmware.git / commits / 71e7358


Commit 71e73580f73601c187dea077de3ac39acdb2b837

󰉖 Browse tree at this commit

Parents : 6e7370a
Author : Mark Qvist <mark@unsigned.io>
Date : 2025-01-09T18:41:35+01:00

Cleanup

Changes

4 files changed, 11 insertions(+), 7 deletions(-)

M Boards.h -1
M Makefile +4 -4
M RNode_Firmware.ino +7 -2
R Release/console_image.bin

Diff

diff --git a/Boards.h b/Boards.h
index 6cf0e6b..62b33b7 100644
--- a/Boards.h
+++ b/Boards.h
@@ -90,7 +90,6 @@
#define MODEL_C5 0xC5 // Heltec Lora32 v3, 433 MHz
#define MODEL_CA 0xCA // Heltec Lora32 v3, 868 MHz
- // https://resource.heltec.cn/download/Mesh_Node_T114/Datasheet.pdf
#define PRODUCT_HELTEC_T114 0xC2 // Heltec Mesh Node T114
#define BOARD_HELTEC_T114 0x3C
#define MODEL_C6 0xC6 // Heltec Mesh Node T114, 470-510 MHz (HT-n5262-LF)

diff --git a/Makefile b/Makefile
index 53f32bd..d2f74a2 100644
--- a/Makefile
+++ b/Makefile
@@ -136,7 +136,7 @@ firmware-genericesp32: check_bt_buffers
firmware-rak4631:
arduino-cli compile --log --fqbn rakwireless:nrf52:WisCoreRAK4631Board -e --build-property "build.partitions=no_ota" --build-property "upload.maximum_size=2097152" --build-property "compiler.cpp.extra_flags=\"-DBOARD_MODEL=0x51\""
-firmware-heltec-t114:
+firmware-heltec_t114:
arduino-cli compile --log --fqbn Heltec_nRF52:Heltec_nRF52:HT-n5262 -e --build-property "build.partitions=no_ota" --build-property "upload.maximum_size=2097152" --build-property "compiler.cpp.extra_flags=\"-DBOARD_MODEL=0x3C\""
upload:
@@ -239,12 +239,12 @@ upload-featheresp32:
upload-rak4631:
arduino-cli upload -p /dev/ttyACM0 --fqbn rakwireless:nrf52:WisCoreRAK4631Board
-upload-heltec-t114:
+upload-heltec_t114:
arduino-cli upload -p /dev/cu.usbmodem14401 --fqbn heltec:Heltec_nRF52:HT-n5262
release: release-all
-release-all: console-site spiffs-image release-tbeam release-tbeam_sx1262 release-lora32_v10 release-lora32_v20 release-lora32_v21 release-lora32_v10_extled release-lora32_v20_extled release-lora32_v21_extled release-lora32_v21_tcxo release-featheresp32 release-genericesp32 release-heltec32_v2 release-heltec32_v3 release-heltec32_v2_extled release-heltec-t114 release-rnode_ng_20 release-rnode_ng_21 release-t3s3 release-t3s3_sx127x release-t3s3_sx1280_pa release-tdeck release-tbeam_supreme release-rak4631 release-hashes
+release-all: console-site spiffs-image release-tbeam release-tbeam_sx1262 release-lora32_v10 release-lora32_v20 release-lora32_v21 release-lora32_v10_extled release-lora32_v20_extled release-lora32_v21_extled release-lora32_v21_tcxo release-featheresp32 release-genericesp32 release-heltec32_v2 release-heltec32_v3 release-heltec32_v2_extled release-heltec_t114 release-rnode_ng_20 release-rnode_ng_21 release-t3s3 release-t3s3_sx127x release-t3s3_sx1280_pa release-tdeck release-tbeam_supreme release-rak4631 release-hashes
release-hashes:
python ./release_hashes.py > ./Release/release.json
@@ -453,7 +453,7 @@ release-rak4631:
cp build/rakwireless.nrf52.WisCoreRAK4631Board/RNode_Firmware.ino.hex build/rnode_firmware_rak4631.hex
adafruit-nrfutil dfu genpkg --dev-type 0x0052 --application build/rnode_firmware_rak4631.hex Release/rnode_firmware_rak4631.zip
-release-heltec-t114:
+release-heltec_t114:
arduino-cli compile --fqbn Heltec_nRF52:Heltec_nRF52:HT-n5262 -e --build-property "build.partitions=no_ota" --build-property "upload.maximum_size=2097152" --build-property "compiler.cpp.extra_flags=\"-DBOARD_MODEL=0x3C\""
cp build/Heltec_nRF52.Heltec_nRF52.HT-n5262/RNode_Firmware.ino.hex build/rnode_firmware_heltec_t114.hex
adafruit-nrfutil dfu genpkg --dev-type 0x0052 --application build/rnode_firmware_heltec_t114.hex Release/rnode_firmware_heltec_t114.zip

diff --git a/RNode_Firmware.ino b/RNode_Firmware.ino
index 98a327d..185b2ca 100644
--- a/RNode_Firmware.ino
+++ b/RNode_Firmware.ino
@@ -241,8 +241,13 @@ void setup() {
#if MODEM == SX1280
avoid_interference = false;
#else
- if (EEPROM.read(eeprom_addr(ADDR_CONF_DIA)) == 0x01) { avoid_interference = false; }
- else { avoid_interference = true; }
+ #if HAS_EEPROM
+ if (EEPROM.read(eeprom_addr(ADDR_CONF_DIA)) == 0x01) { avoid_interference = false; }
+ else { avoid_interference = true; }
+ #elif MCU_VARIANT == MCU_NRF52
+ if (eeprom_read(eeprom_addr(ADDR_CONF_DIA)) == 0x01) { avoid_interference = false; }
+ else { avoid_interference = true; }
+ #endif
#endif
#endif

diff --git a/Release/console_image.bin b/Release/console_image.bin
index ceb1bd7..a87d725 100644
Binary files a/Release/console_image.bin and b/Release/console_image.bin differ


──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────